bitkeeper revision 1.1236.1.23 (421f3b04FuVFrUEUrYIs2_3sbFngVg)
authormaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Fri, 25 Feb 2005 14:49:40 +0000 (14:49 +0000)
committermaf46@burn.cl.cam.ac.uk <maf46@burn.cl.cam.ac.uk>
Fri, 25 Feb 2005 14:49:40 +0000 (14:49 +0000)
commit1c67dd889b7dc31eb78824965395c5131798e509
tree24012d4fbf8d2c3153e96792c7948fe4f05ce8b1
parentac9bb9bb10d205a5538f61b5020dab1a2df11b6d
parent4d747b04c4fd745f9e4c30397c898d26d065c9f3
bitkeeper revision 1.1236.1.23 (421f3b04FuVFrUEUrYIs2_3sbFngVg)

Merge burn.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into burn.cl.cam.ac.uk:/local/scratch-1/maf46/xen-unstable.bk

Signed-off-by: michael.fetterman@cl.cam.ac.uk
xen/arch/x86/domain.c
xen/arch/x86/mm.c
xen/arch/x86/shadow.c
xen/arch/x86/vmx.c
xen/arch/x86/x86_32/traps.c
xen/include/asm-x86/shadow.h